Add support for Setup