Refactored logic page dependencies