Add safepoint mechanism