Refactor - Elements list