Changed baseURL to final and static