updated helper classes