Added support for new implemented features