Adding registration checks