Fix persistence handler restrictions