Use string IDs
minor fix
Merge branch 'endpoints' into develop