Add more detail in places