Updating Queryable and Bound typeclasses to work without being as generic