Added support for Swift shoebox handler