Improve debugging options