Page and Module now use extend method