Fixes related to REST
All attributes have preffix ws-