Convert fake interfaces to utility classes