Added missing dependencies
Lint issues resolved