[UPDATE] remove extend_or_create