Add place for early checking