Updated to include information lost in transition from existing documentation