Adding required fields validation