Feature: Updated from 2.4.4 to 2.5.0