Adding More validation