Changing plugin to use the container