Updated to new pocioci switch format