updated for base and helper classes