Updated to reflect implementation changes