Added automatic ctor support