Maintain full compatibility