Added Forms Support in the API