Added Entity and Player types