Adding implementation of new features.