Fix #21 Added entity details incl data upgrade & tests