CRD: Updated for more instance variables