Added base cors support