Move various properties to metadata, to enable reuse