Improved Standalone Capabilities