Added friendly Entity wrapper