Added verification mechanism