Changes to accommodate custom process logic