Todo in PathUtils.java
Enhanced FallbackModule.java