Make binding configurable
Fixed path handling