Call register from common, plus some refactor