changed enity model and services and rest
changed enity model and services and rest