Implemented missing functionality