Preparatory work in migration to Table/Column structure