Updated dependencies + moved to simple-* method style