Simplified configuration and moved clients to support factories