Implemented some missing parts