Added generic entity