cleanup
Configurable namespace
Added CLI interface, fixed whitelist behavior