Feature added

Jira ticket #