added presence support