Updated schema and divided user address into hostname and username