Added code to handle all kinds of classpath entries