Improve setContent