Added GetByIdOrDefault.