Feature/169 simplify capabilities checks

@Chrico please review and merge