Moving back to basic plugin design