FIX: Move to utils