Added function default values for testing compability