Add support for filename refine