Some refactoring and abilities now filtered by spec