Update to work with new components