Fixed to support the New LifeAPI.h