Some feed class reorganization