Introduce drawer persistence