change entities definition according to new spec