Fixed class references to avoid recursive reference