Resolved some issues in service