Modify to work with new resources in classpath