Removed cross-origin dependency for now