Sass architecture update