Add support for only using initials