Add support for constructor arguments