Use ability enum everywhere