Refactored affix file to allow for new parts of speech