Update to include the business layer adjustments requested