[TASK] Better handling for different states