improved the directive, added more elements