Adds support for returning architecture