Added Entity enhancement