Added more business rules