Update to work with expandables refactoring