Added files for legacy compatibility