supporting more variations of entry codes