Removed Service Layer