Added Bazz check and Fixed validation