Restructuring to allow for updates