Added USB support, property file includes, etc