Add constructor and debug statements