Added metadata check