Link factory aggregator config and documentation clean up
Collect more constants to be Java constants
Don't depend on static injections in templates