Add proper binding code