Updated metadata implementation