Updated due to modifications in dto class and plugin interface