Adding entity support.