Added more constraint options