more fields and models added