Replaced manual di bindings with convention ext.