Refactored to use default values