Improvements in the Core Module

Follow