I would put this code in the same properties provider