Updated named constructor support to align with the editor's draft