Moved into setup stack to break excessive dependency