Updates for PLF4.0