Improve capabilities parser