Added support for applicationId.
Doc updates, small renaming.