Minor changes
Minor changes - allows null and empty ("") aliases