Move service scan data into a separate model