Added metadata base classes