Helper classes minor changes