Change bind api for the better