Added schema, modified login