submeta refactor