Adds scope wrappers for build