Enhancements for Core Module

Follow