Updated for new smart object API.