Refactor adding classes to test the funcionality of the plug-in