Added PasswordState and GuiService