Added more generic instances