Added filename parsing