Upgraded to support athlete factors.