Also fixed a minor issue where the configuration HashMap was not initialized and threw a NullPointerException.