That probably makes more sense - I wasn't completely sure of the class design so I wanted to make the most conservative change.