Added fields in users, Removed security exploit