Preparing metadata refactor