Will this need to be expanded for voice (+) and other common modifiers?