changed some old bindings to the new unified structure