Changes in CSD API to use Spring-rest