Added database objects
Fixed merge conflicts
Fixed merge conflicts