Added a few missing Classes and methods