Upgrade extend to 1.2.x to be up to date and fix bugs