Fiked circular references.
Adding super class.