Adding option for setting default unit