Added some more elements