[OE-4006] - migration and models changes