Fix: remove templating in api use