Replace @deprecated usage