Updated to have cleaner syntax for empty value