Adding support for specifying constructor args