Organized properties
* Fixed bug in capabilities merging