Implement multi uid support
Fix comments