Updated for next version
Single arg to ctor now