Improve component design