Addressed review comments.  Added missing class.