Updated Service Layer