[UPDATE] Add entities