Updated helper classes