Fixed Schema and db files