Re-checked the codebase and updated it to new functionalities.
The recent changes deserve a new minor