Fixed database structure, added tables, removed schedule