Helper for the new framework