Improved spa2 to handle ACT-R modules