Added most registration checks