[TASK] Refactored
[TASK] Bumped version