Added new elements and tests