Forgot to include new classes