Updated with new API Plugin