improved entities