Amsterdam, General Extension Plan