Cleaning API, deprecating
Update tests for new API
Update objects for new API