Added Capability classes

tested