Added Z constraints