Improve binding behavior