Fixed Persistency and parser steps