[TASK] Added features