Corrected entities hardcoded