Commit
Moved extended_valid_elements to valid_elements