Added some helper classes
31 files changed