Intermediate commit: working on Database.