Added missing default values