Updated build for standalone