Add note
Improve handling of constraints