Preparation for migration #26
WIP #26