Added some more essential classes.