Add more directories to consider
Add more platform thoughts