revamped plugin architecher