Adding wrappers for non-valret platforms