Better api (6/14)

Better api