Changed file path handling to generic