Updated to match the new implementation