ESC-17 Temporary work to add Play persistece support...