entrypoint class further adapted