Adjust code for Helpers namespace and code changes