Progress on entities' modeling