Implemented missing methods