Some structural changes in Helper.h and UnavailableMethods.h