Re-introduce compatibility