added Entity support