Updated all constraints to use new return value structure