Added metadata class