Implemented some more elements