better naming of extensions - move to own class