Added build checking