Fix path matching and add nicer syntax