change architecture of helper