Internal changes in entities handling.
Style changes.