Issue refs #1809: refactor migrations (more finegrained objects creation)