Updated to use the latest format