More classes partially moved from editor