All previous functionality now seems to work using the new structure