Major updates in configuration and service compositions. Added tests.