Cleaned up probe creation