Added map handler generation to the framework