Preparing to migrate the "metadata" code to its own class.