Added option for custom filename