Updated swift components with latest changes from grizzly