[TASK] Refactoring and support for description