NinjaBinding and some more changes.