File listing mapped, forced save added