refactor
update dependencies
Set adapter