Adding classes that were missed out in previous commit.