Changes done for Standalone Version