Functionality Improvements

Issues Resolution

Known Issues: