Minor fix on review comments
Add single user mode
Avoid ACL and Policy checking