STS-3646: Forgot to export the new classes!