Simplify binding handling