Updates to new classfor() syntax