Add 'user' and 'group' support