Added default values to check