Updated to match newer spec