Feature: Simplify metadata