STY: Cleaner API change