Adding :es and :fr support