added new structure support