Improve binding behavior

Improve binding behavior.