Add figure picking