Implemented missing functions