Updated Approval Support to allow for a cleaner way to find valid approvals