Added helper classes and china post