added more directives, moved svg data to service