Entity add and update added
Entity persisted throughout flow and header add back in