Small refactor to differentiate between design and elements