Xproperties extracted to separate module