Changed metadata handling.