Configuration Builder added, minor changes all over