Move to extension method