Updated check to verify registered