Removed Passwords and added Prefixes