Updated Service layer.