Skeleton for binding support + some fixes.