Re-add compatibility