Added more re-use classes