Added Context for tracing
Updated format to be central in AbstractEntry