Fix user and group schema