More build automation