Refactor capabilities