Consolidate endpoints