Fixed map and added database