Migration and design options added