Added support for changing the filename key