Working on pluggin integration