Added Service Layer