More elaborate entity support