More classification logic