Domain and toolkit modules changed for Compile scope