Add Julian's wishlist to 2.0 spec