More scoring integration (minus strcomp)