Added support for many MATLAB constructs