Add user index
Fix models