Changing Plugin structure and adding Invoice object