Add path and logging