Implemented extra features