Exceptions and service methods were added