Changed EntityData, updated templates