Added support for Entity detection + Updated reference