Properly support output path and callback
1.4.7