Adapt application to deal with presisted data