More validation options
Added better error handling and serverwide timeouts