Refactor rebind methods