More class migration for #8