Implemented new feature. Still to finish tests and acceptance tests