Made changes to allow for other tag types to be processed.