Added root context and persistence