I like the simplicity with which you added the constraint support here :).