Adds build scope wrappers