Moved keys and users lists in models