Better Standalone Support