Add a FIXME: about the deprecation of handler/site