Improve component design (auto fix circular references)