Standalone Helpers fixes and Updating to version 2.1.2