pojo changes and user services