added description, more consistent element/structure naming