Refinements for DESY environment and more