Updated binding framework