Forgot to include a few classes in last commit