Updated the core
DB changes
DB changes #2