add fields and better file name composition support