Maps added, refactoring