Add binding
Improve database