Added gaufrette support