Implemented remaining methods... Sorry for late commit