Added common
Minor changes