Dependency update
Code updates