need some attention in Models