Initial work for filename handling abstraction