Readd marker interfaces for migration step