Added generator+migration