Fixed all persist data stuff