Changed to constants for defaults