Adding struct/union support