Added Models, slightly changed DB script