Related to #98. Missing class in previous commit.