Fixing up metadata module