[TASK] Variants/Behaviour optimization