Added handlers for expat-based implementation.