Add persistence capability, improve presentation