Started adding build constraints