Adds and fixes circular inheritance.