Adding migration support. CSCuj65675