add ContentClass & modify SharedKey-related code
firx merge conflicts