Add uppercase, braces and hyphens options