Porting more code from Definition -> Operation