More major internal changes
Updated to V4.1.0