Improve some function binding