Updated Service logic