Added navajo.entity feature