Changed the maps main methods, added core header, and update observers definitions.