Fix structure ofr servie providers