Added structure for python bindings