[fix] Fix entities