Adapted to new-style app configuration.