Refactor capabilities support
Fix comment
Merge pull request #29 from 2gis/refactor-capabilities

Refactor capabilities support