Model fixes + Map Facade