Implemented two missing methods