Added keywords and description
Added exception classes
Modified ServiceContainer