Added constraints to command stack entities