Focal Refactor 2.0, removed FocalOperation classes