added Server and Storable
updated storable to Password and Location