More features implemented