Implemented some missing functionality