Lighweight components

Reference for #1376