Code move to framework