[TASK] Further changes