In progress commit of entity persistence filter to share code for review.