make Entity owner types s more struct