add logger
add sahara support