Updated imp++ to use regular maps