Add code to extract ctor