FIX: Use integers