Added support for constructor and private properties