Simple version working under old naming convention