Replaced in page writer components
Tidy up page reader and writer