Updated to work with SMW 1.8