Refactor abilities