Added metadata handling.