Added proximity support