Updated to support 5.4.1.17538 + extras