Content Class updates