Build is modified as per convenience