Fixed database entity classes