Added old functionality preserving files for naive operation.