Update .content implementation based on a suggestion from bz