* Merged two classes in the same module to prevent class loading
  order crash