Compatibility

Made it work with the two updated classes.