Updated Entity component