Updated dependencies & updated controllers