Added example schemas, and some bug fixes