Refactored to use base URL