Fixed dependency cycle, database needs to be created first