Complex database and some simulation fixes