Added types, removed base class edits