Add API for struct/union