add more elements and attributes

Signed-off-by: Atanas Kerezov <kerezov.atanas@gmail.com>