Added support for non-javascript users