Updated addresses, more EntTypes.