Added support for constructors