Fix Entities Model