Enhanced entity