Migrated URLs to Common Service for better abstraction