Types moved to a separate file; moving to a native type declaration instead of persistent-way