Different additions/modifications to the pages plugin