Compatibility with updated Wallbase