Update to main class to work with recent updates.