Less queries for all usage migration