[TASK] Some semantic improvements