Working on pluggable api