Adding more complete transformation parsing