Added proper logs