Updated classpath to use common components.