Minor refactored DatabaseSession and minor database schema