Add POC implementation of work around for swift interface issue.