Removed Exception
Cosmetic changes only
Added capability wrappers