support cors and also make naming a little more obvious