A little change on the first implementation of metadata events