Add check for more users