We want a way to handle both types of schemas in a consistent way. This may involve creating a new command line tool to manage.