Add and modify some helper classes