Reworking to use new structure under a new name