Use Map for bindings #596