Changes Done for Standalone version