Queries reorganised, partial method implementation
Added callbacks to insert and delete methods
Merge branch 'feature-db-identities' into develop