Change entity API format