FIX: Duplicate constants and refrash after command