Modifications to restore compatibility with the abstraction layer.