Cleaned api
Merged changes