Added Entity logic