Updates after security review and more testing