Added changes in entities after database fixes