Added in database support for objects
Merge remote-tracking branch 'origin/master'