Fix persistence capability, improve presentation