Refactored parts of utils/support component