Added client token to titles and type.
Updated for initial deployment.