Started commenting Entity.cs