Added proper metadata classes.