Improve utils and assert module