Updated structure to work with plugman