Takes advantage of new builder pattern. Also reverted elimination of properties for feign and ribbon.
