Switch to only ids