Completed base class layout
Update with KeyArchiver