improving API
Merge branch 'feature/db-api-improvements'