Improve setHolder