Improved construction mode (it is a service now)