Add utils and logging