Update on entities [ci skip]