Template overriding is now supported