Added %f/%e/%E support