small updates in entities