Fix feed class structures