Added raw entry support