Removed class level capability, added support for primitives and nested classes