Use a cleaner plugin/service design