Added support for blacklist; Many bug fixes