Switched verification checks to be more dynamic