Beta version of get/create/update entity