Fiix name issue, refactor handlers