Ported over yottr classes and persistence config and it seems to be working.