Fix bind deprecated & entity