added entities from @vamekhi