Added helper class to remove code dublication