added schemas and used scaffold