Add more for types