Adding ContextBuild