Entity SP: field rework continues