Standalone

Added standalone support