updated model with bunch of tables