Initial changes to scaffold addon