added entity support