Feature/np expandable plugin