Added basic schema management