Updated database layout, added first queries