Parameterized the class and added in-manifest documentation.
Merge commit.