encoding updates and removing athlete type