add support for schema; change some names