Implemented logging in the rest of the application