Fix FindBugs warnings
Fix duplicate user adding
Accept multiple value types
remove deprecation: no alternative