Add better handling of groovy paths