Try to decrease complexity of Bibl migration