Added user id
pageType refactored