Add support to customized filename