Added entity support