Add more existence awareness