Adds working filepath parsing