More octave support