Implemented missing methods
Updated TODO comments