#35 Renamed password to key