Improve customize