Add affix and move about model to its own file