Some entity changes to support living conditions