Updated binding framework and cleaned up