Update to work with newly refactored classes