Updated for thingstance