Added schemas and better images