Improve multiple pages handling
Add forgotten imports