Consolidated APIs.

Updated class comments.