[FEATURE] Updated to latest spec