Add additional helper classes, user methods