Implemented new features