Updated commit with XML delegate methods