Adpatations to changes on persistency layer