Add support for user type and content encoding.