Implementation changes due to bind_method