Added entity_id to vm::value. Consolidated effect and thing entities.