updated migrations and models for habtms