Added more helper classes