PropertiesBundle: more code factorization