Fixes and API improvements
Deleted trash