Added more build automation