feat: improve the entity loading logic;