Removed usage of Logging-Api and added some required measurements