Add constructors support