Add upper bounds to wai*