Some improvments
New data with pages