Major simplification to constraint handling in reference platform