Added addable_to_metadata check