Handle error and added argument support for universal behaviour.
Removed Extra jars and updated Debugging calls.