Added CurrentPage module