Possibly but I am happy it is working as is and am not in a hurry to change as have a few other projects on the go. Is it ok to leave it like this? I am happy to keep this in my own repository since I am not sure anyone else will use this binding in reality.