Added control for build