Update any m_h* to return Integer; Add in handle to Entity function in Utils