Adding changes to Configuration class missing in last commit.