UPDATE: additional elements
UPDATE: add core elements