Adding formalized plugin solution