Added more helper classes
More standardization