SOC: Updating to use native classes. SOCSections not updated yet