Updates to comply with new m_prototype