Updated to match PropertyLib name changes