Updates to conversion hierarchy