Initiated integration of best practices from ISXEVEWrapper.