RESTWS-368: Added Feature :)