Refactored Py_Map