Forgot to include the new classes