added schemas, changed keys of returned values to match schemas