Fixing API scenario and added logger