improved models and db