Add more dump scanning stuff!