few changes on protagonist, more cates on entity