Added handler options