Updated for 'setValue' support