Collapse Service class into Plugin